Seperate view from server and ui, aws changes