Added: More layout and smaller buttons