Restructure view