Removing reference to flat-ui for now, few other tweaks