fixed dll error, standardized layout trough whole app