Fixed bug with enter key, added tests, moved some assets around