More fixes for the software selection UI

 * Also fixes many empty spaces and readability