Lots of new changes, still working on layout