add TODOs
clean up layout and dispose