Updated to standard look and feel