Refactor and cleanup
fixes conflit
Merge branch 'Shine-neko-refactor-ui'