More quotes added and UI tweaks