Custom border and small updates.