Changed back to using pure jframe