Refactor to server views and angular for ui support