Working buttons, improved? layout -Pablo