Implement Add/Remove buttons
Fix EntityView Layout