styling + fixes