Significant GUI/View improvements