Improve the generic layout, move to a complete use of blade and adopt bootstrap as css/js