Several ui updates, more icons, better organization