Fixed large image bug and UI fixes