Fixed all bugs, Public layout working smooth