Optimized layout for smartphones and tablets and Fixed #1