Minor cleanup and sidebar subpage menu