Auto formatted files again to keep consistency
Fixed merge conflicts with command screen update
Made tiny modifications to command screen