Updated styles, fixed bugs