Remove un-necessary whitespace
Remove device width constraint