Make buttons inline and modify their text [PD-823]

New pictures added. See comments.