Ms fixes

fixes several issues and tweaks the design