Temporary Stable Code
Fixed more Layout Issues