Working on UI, fixing ajax stuff