changed layout and implemented toggle (Done Level2)