Buttons working, screen layout improved