second commit

complete start over from Flat UI