Updated design

much cleaner
Updated Design

Much cleaner