Alignment and Hardcoded string issue fixed