Finished Enterprise page & Medicine page, improve some code