Ion stuff done + ui changes