Clean up & fixed min height