Updated questions, javadoc, buttons into classes