Further changes for UI Prototyping