adding test code
moved outer layout into single views