added tooltip + refactored layout