Numerous changes to look and feel