Fixed warnings
Fixed/simplified layout