Improved graphics
Clean up