Added Attributes page && some cleanup.