UI improvements
More off-by-one fixes