fix layout problems
update TODOs