Change layout and add less files