changes to structure
some visual updates.. working on improvements