restructure project, UI tweaks