Reformat layout files
Implement Account Filter, problems remaining!