More fixes for layout
Added skeleton of crud