Improve layouts, remove ClassInfoActivity