Fixing up layout for trace - testing to make sure things work as expected