fix a few layout issues
start working on models