Power system UI refactor
Merge pull request #13 from acperez/development

Power system UI refactor