top bar done
many fixes