Minor semantic and layout improvements, removes warning in stock manager