Removed Irelavant layouts and update more constants
Using Service to do stuff