Layout update

Change layout for desktop, tablet, mobile, added borders and item
highlights