Few more styling changes