Dropped auto-hiding of FAB, code cleanup