fixing UI bugs & normalizing the site basic structure