fix merge conflict - remove font-awesome - some style tweaks - lots of ux changes -  style changes