Start to styling
Some more goodness
merge in BG's changes