post logic and hiding plus minor aesthetics