fixed indentation for tabs
some layout changes