Cleanup buildout and correct status image