Add admin links, clean some stuff up