Added/Fixed UI Elements