BUG Fix small screen size issues