Some visual fixes, ready to deploy :)