Improved Layout, RegEx updated + minor fixes