Misc visual changes, add analytics