Began work on putting XML tags into containers to make interface code more readable