moved button and fixed up edittext