Bug: Fixed modal and topbar