added navbar
Merge to get latest versio
iOS alpha ready