Updated layout
Fixed default ranks
Update todo