Nesting and database structure in progress, layout and bootstrap features added