More bug fixing and style formatting - such as positioning of values