Show main content fixed and minor fixes