modifying styling, and making sure up to date
cleanup and fixing conflicts