Added sidbar and topbar elements and bugfixing