first updates
conflicts resolved
further styling updates
styling updates end W8D1
styling changes
added icons and background image
integrated latest updates