Added spacing, moved some properties to resource files