Fixes Issue #2

Worked on "fill" and "expand" options to make a more pleasing expanded look.