fixed z-indexes, cleaned up directory