Redesigned some elements