Implemented buidTime() functionality
Updated the default layout