Cleaned up code locations;
Added a visual clock;