Visual fixes and updates
Minor bugfixes