Restructured some code logically
Added spec selection menu