Tops page design fix, linker fix