Improvements on mobile Layout - better scheme