Fixed style, added events