Fixes/tweaks/styling #165

Closed dmheisel closed 4 years ago