Added better sizing fixes