Added graphics, cleaned up interface