UI Modification and add demo key