added icons
fixed taborder