Improve more styling