remove unused code
new working view layout