re-orged files, added hover state