- Fixed some layout problems concerned with Toolbar