Various styling changes and smaller updates