Fixed Bugs and Modified Admin Window