renamed layout to content
fixed widget order and cleaned up a bit