Revert "change subtitle and nav position"

This reverts commit a0f5b1bb33743ad847b1b5cd3ceb4b0d077a711b.