Refactor front-end code, remove redundancies

Also, removed animation from message that did not complete reliably.