Changed layout, added effect calculator