Changed Issue UX and one bug fix