Improved graphics (less hardcoding, better appearance)