Fix error thrown from sidebar
Minor style tweaks