Moved button sizes into button screen adapter and made all buttons have proportional sizes instead of hard coded
merge