layout and buttons upgrade