Added account settings
Clean up the pins scaffold