Fixed JS loading and cleaned up data from REST API