Cleaned up/commented
Re-organized UI flow