added login throughout site
resolved conflicts; made login work again