Fix small screen bugs