Moved filter and box to seperate files