Added topbar and fixed some looks