Layout and timelogs refactor for better code climate score.