fix layout and add get current location