Fix formatting and endless scroll