Design improvements and polish