updated some more, to prettify and  work out the  spacing/sizing  a bit further   looks and works a bit better right now..  need to remove some code duplication