Added some changes to layout after transferring app to mac