fix design & fix others details