tweaked the layout
merged new view with new controller