added account and header view with some clean up