Added taskbar and cleaned out output