Smaller visual fixes and removed uneeded partial