UI polished a bit and fixed appAvialable error