Cleaned up code, and added in more edge case detection. Added icons and polished up the application.