Design improvements and apn bug fix