Refactor some layouts and changed some edit text placeholders