Fixed some issues with small screen. Added some checking work