Cleanup view code generated by Cake Bake
Fix inheritance error
Fixed layout for initial tests