Restructured with FlatUI