code style
spinner positioning
solve merge conflict