add views, remove old code from duplicated file, server code