Fix multiple issues for small screen