redo some aesthetics
redo some aesthetics