Minor UI tweaks
Credits updated
merge latest kozlek/master