Refactor Layout, ID's and Attributes