Fixed alignment issues and extra hover area