Added min height and improving performance