Systems list and overall fixes for enduser