styling + UI improvement