Added error messaging and clear button