add more styling changes, stil migrating to service