UI tweaks; fixed button click ability bug