Updated Interval
Cleaned up UI