Fix buttons for portrait screen rotation. 

Issues 108 and 152