Toggle and some aesthetic changes