More code cleaning and removed of menu bar.