continued restructuring and added some css