some fixes
improving front-end architecture