Changed to 3 tab view