Some slight visual changes and polish