Added toggle button and aesthetics++