Added some dynamic sizing