Chris helped with styles, fix small bug