Cleaned up UI: added buttons instead of options box, made question clearer
fixed merge