Fixed layout glitches and added buttons to hp matching.