Layout corrections & countdown fix