Improve design & title buttons