Changed layout and implemented resize restrictions
Merge branch 'gui'