Fixed small bug and aesthetics