Fixed issues

fixed tabs, added label and moved to correct order