Got rid of flat UI