some final visual touches, seems to work