Adding icons and improving aesthetics