Aesthetic improvements (maybe) Update 5/27