Adding min-height, consolidating props