Merge pull request #285 from LoungeKatt/master

Clean up the layouts and separate paths sections cleanly
Update the logs to include the trace line number [hopefully]