Remove excess icons, finish homepage tweaks