Fixed achievement layout order.
Added discretionary achievements