bug fix
merge app
start making the part of ajax