Redesigned some ativities