Rewrite layout to actually use links