Bug fixes and minor layout changes

Signed-off-by: Cory Feitelson <cfeitelson@roovy.com>