Fixed image bug, need to improve carousel