Sort out spacing, cleanup and tab nav