Playing with Flat-UI

small modifications and tests