[IMPROVEMENT] refactor public views