Candidates: add a little extra padding
Remove old layouts