started reworking towards single-page app