Improve graphics and layout