Issue #79, Add ajax and improve view