duplicates/padding

- Reduced total # of lines looking for repeating selectors (200+ to < 150)
+ Adjusted height of tab bar and removed (most) of the leftover issues