styling changes and finalisation