Improved markup to fit 100% on most devices