Some updates including Where's My Class implementation and new design