Landing v-0.6.1

class naming changes, comments added, popup align nearly finalized.