Added changes for look and feel