#3 working on new folder add and layout fixes