Cleaning code
Including feature specs to Admin Dashboard