ADDED: Some extra styles and markup - Lots to do still!