Added better module view