Updates and Fixes

Fixed layout and html. Updated css styles and sass order.