Moved app name and picker name to application_.xml