added table layout and a few buttons