fixed some styling issue and moved some hardcoded string to constant file