Remove green background, fix element naming
Misc Updates