layout slightly tweaked
more todo