Fixed issue with small screen and extra margin/padding