1. Refactored javascript variables.
2. Fixed activity editor layout.