Updated Flat-UI-Master