Removed unneeded to top links and few other tweaks.