improve(app): small fixes and improvements