added topbar but buggy