Corrected layout, added some front end facilities