#10: code beautifier support added for device tabs , code refactoring