Partial fix for the re-design