smarter layout, fixed stretching problem, added icons for buttons