Finished re-design and removed duplicate file