adding some styling changes and fixed policy issues