finalized layout and updated less