Cleaned up UX, added features.