Add remote, design fixes