Added some controls and visuals