fixed container height issue and cleaned up more internal styling
fixed conflict