Updated tracking, tweaked layout

Close #83