Design improvements and permission fixes