Improved design, removed unused action listeners