Added visual fixes and changes
Major redesigns and clean ups