tweaking layout for better z-index
adding in a ton of changes