added some layout. nothing is beautiful