Finalizing some styling changes