Button fixed, login page re-arranged