more UI features, better structure