Added a clock and made the layouts more platform independent