refactor more views, update design a little