Final changes done, except top carousel